Auto merge of #1940 - steveklabnik:whoops, r=huonw
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 23:18:58 +0000 (23:18 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 23:18:58 +0000 (23:18 +0000)
commit6192ef578b45d7c625c52548ac04e1e18051e703
tree5941ad4a8279987d89f105caea00e5506a7993fa
parentba64c1fc1f45167814736d7b7dd168c037862a3c
parenta42dfb0832efaa9ece0ba0d71ebeb706aa87f479
Auto merge of #1940 - steveklabnik:whoops, r=huonw

Thanks @huonw :sob: